rename branch status modif by operational status modif #377

ghazwarhili · 2023-11-20T08:04:34Z

No description provided.

…sModif

SlimaneAmar · 2023-11-22T15:53:11Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

-        BRANCH_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
-        BRANCH_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty equipment action type"),


Empty operational status action type ?

SlimaneAmar · 2023-11-22T16:03:11Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

-        BRANCH_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty branch action type"),
-        BRANCH_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
-        BRANCH_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),


OPERATIONAL_STATUS_ACTION_ERROR

SlimaneAmar · 2023-11-22T16:03:34Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

-        BRANCH_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
-        BRANCH_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty equipment action type"),


OPERATIONAL_STATUS_ACTION_TYPE_EMPTY

SlimaneAmar · 2023-11-22T16:04:26Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

-        BRANCH_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty equipment action type"),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),


OPERATIONAL_STATUS_ACTION_TYPE_UNKNOWN

SlimaneAmar · 2023-11-22T16:04:43Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

+        OPERATIONAL_EQUIPMENT_ACTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty equipment action type"),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST),
+        OPERATIONAL_EQUIPMENT_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR),


OPERATIONAL_STATUS_ACTION_TYPE_UNSUPPORTED

SlimaneAmar · 2023-11-22T16:05:57Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

@@ -150,8 +150,8 @@ public static NetworkModificationException createEquipmentTypeUnknown(@NonNull S
        return new NetworkModificationException(Type.UNKNOWN_EQUIPMENT_TYPE, "The equipment type : " + type + " is unknown");
    }

-    public static NetworkModificationException createBranchActionTypeUnsupported(@NonNull BranchStatusModificationInfos.ActionType type) {
-        return new NetworkModificationException(Type.BRANCH_ACTION_TYPE_UNSUPPORTED, "The branch action type : " + type + " is unsupported");
+    public static NetworkModificationException createBranchActionTypeUnsupported(@NonNull OperationalStatusModificationInfos.ActionType type) {


createOperationalStatusActionTypeUnsupported

SlimaneAmar · 2023-11-22T16:07:13Z

src/main/java/org/gridsuite/modification/server/NetworkModificationException.java

-    public static NetworkModificationException createBranchActionTypeUnsupported(@NonNull BranchStatusModificationInfos.ActionType type) {
-        return new NetworkModificationException(Type.BRANCH_ACTION_TYPE_UNSUPPORTED, "The branch action type : " + type + " is unsupported");
+    public static NetworkModificationException createBranchActionTypeUnsupported(@NonNull OperationalStatusModificationInfos.ActionType type) {
+        return new NetworkModificationException(Type.OPERATIONAL_EQUIPMENT_ACTION_TYPE_UNSUPPORTED, "The branch action type : " + type + " is unsupported");


The operational status action type : " + type + " is unsupported

SlimaneAmar · 2023-11-22T16:09:05Z

src/main/java/org/gridsuite/modification/server/dto/OperationalStatusModificationInfos.java

-public class BranchStatusModificationInfos extends EquipmentModificationInfos {
+@Schema(description = "Operational status modification")
+@JsonTypeName("OPERATIONAL_STATUS_MODIFICATION")
+@ModificationErrorTypeName("OPERATIONAL_EQUIPMENT_ACTION_ERROR")


OPERATIONAL_STATUS_ACTION_ERROR

SlimaneAmar · 2023-11-22T16:14:02Z

...main/java/org/gridsuite/modification/server/modifications/OperationalStatusModification.java

+
+    private void applyTripEquipment(Reporter subReporter, Identifiable<?> equipment, String equipmentTypeName, Network network) {
+        Tripping trip = null;
+        if (equipment instanceof Branch<?>) {


Create a method to return the tripping class to use from the equiment type

And throw an exception the equipement type is not treated

SlimaneAmar · 2023-11-22T16:18:29Z

...main/java/org/gridsuite/modification/server/modifications/OperationalStatusModification.java

+        traversedTerminals.stream().map(t -> network.getIdentifiable(t.getConnectable().getId()))
+                .filter(Objects::nonNull)
+                .filter(distinctByKey(b -> b.getId()))  // dont process the same branch more than once
+                .forEach(b -> b.newExtension(BranchStatusAdder.class).withStatus(BranchStatus.Status.FORCED_OUTAGE).add());


Add a method which add the extension type from the the equipment type

…ationalStatusModif' into rename-BranchStatusModif-to-OperationalStatusModif

sonarqubecloud · 2023-11-23T10:08:07Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
7 Code Smells

80.6% Coverage
0.0% Duplication

SlimaneAmar · 2023-12-18T13:41:44Z

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

+        throw NetworkModificationException.createEquipmentTypeUnknown(identifiable.getClass().getSimpleName());
+    }
+
+    public Tripping getTrippingFromIdentifiable(@NonNull Identifiable<?> identifiable) {


This methos is specific to the operation status modification
Move it

SlimaneAmar · 2023-12-18T13:43:26Z

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

@@ -514,6 +520,39 @@ public Terminal getTerminalFromIdentifiable(Network network, String equipmentId,
        return null;
    }

+    public Set<Terminal> getTerminalsFromIdentifiable(@NonNull Identifiable<?> identifiable) {


Why a set ?

SlimaneAmar · 2023-12-18T13:48:11Z

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

+            return new BranchTripping(branch.getId());
+        } else if (identifiable instanceof ThreeWindingsTransformer w3t) {
+            return new ThreeWindingsTransformerTripping(w3t.getId());
+        }


SlimaneAmar · 2023-12-18T13:52:44Z

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

+                    hvdcLine.getConverterStation2().getTerminal()
+            ).collect(Collectors.toSet());
+        }
+        throw NetworkModificationException.createEquipmentTypeUnknown(identifiable.getClass().getSimpleName());


This methos is specific to the operation status modification
Move it
And throw equipmentTypeNotSupported
Use powsybl getTerminals method

SlimaneAmar · 2023-12-18T13:53:09Z

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

+            return new ThreeWindingsTransformerTripping(w3t.getId());
+        }
+        throw NetworkModificationException.createOperationalStatusActionTypeUnsupported(OperationalStatusModificationInfos.ActionType.TRIP);
+    }


Throw equipmentTypeNotSupported

…sModif # Conflicts: # src/main/resources/db/changelog/db.changelog-master.yaml

rename branch status modif by operational status modif

946fa37

ghazwarhili requested a review from SlimaneAmar November 20, 2023 08:04

ghazwarhili added 3 commits November 21, 2023 13:49

fix unused import

48212e6

fix failed tests

4367789

Merge branch 'main' into rename-BranchStatusModif-to-OperationalStatu…

abb7c9a

…sModif

SlimaneAmar reviewed Nov 22, 2023

View reviewed changes

ghazwarhili added 2 commits November 23, 2023 11:02

fix code review remarks

fdd38ee

Merge remote-tracking branch 'origin/rename-BranchStatusModif-to-Oper…

47513b3

…ationalStatusModif' into rename-BranchStatusModif-to-OperationalStatusModif

SlimaneAmar reviewed Dec 18, 2023

View reviewed changes

ghazwarhili added 2 commits December 19, 2023 13:48

Merge branch 'main' into rename-BranchStatusModif-to-OperationalStatu…

93a3def

…sModif # Conflicts: # src/main/resources/db/changelog/db.changelog-master.yaml

fix code review remarqs

8d0cbad

ghazwarhili closed this Feb 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rename branch status modif by operational status modif #377

rename branch status modif by operational status modif #377

ghazwarhili commented Nov 20, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

SlimaneAmar Nov 22, 2023

sonarqubecloud bot commented Nov 23, 2023

SlimaneAmar Dec 18, 2023

SlimaneAmar Dec 18, 2023

SlimaneAmar Dec 18, 2023

SlimaneAmar Dec 18, 2023

SlimaneAmar Dec 18, 2023

rename branch status modif by operational status modif #377

rename branch status modif by operational status modif #377

Conversation

ghazwarhili commented Nov 20, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Nov 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment